chore: merge dev into main #57

ronjalh · 2026-10-16T09:19:01Z

NB: do not delete the dev branch when you merge this PR. Leave "Delete branch" unticked (or turn off automatic deletion of head branches), because dev is the branch where all the work is done and all other PRs point to it. Use "Create a merge commit", not squash or rebase, so main and dev keep a shared history.

Summary

Updates main with what has been done on dev. main is only updated from dev; all other PRs go to dev.

Merge #56 (main into dev) first. It brings the colours from PR #35, which were merged directly into main by accident, into dev. After that this PR is a plain update of main.

What is new on `main`

Merged into dev since main last was updated:

docs: add design mockups #18 design mockups in the docs
16 extract catalog data from the code of points #34 the catalog data extracted from the Code of Points, with the extraction script (data/, scripts/extract-cop/)
docs: add GraphQL schema draft for the catalog #29 the first draft of the GraphQL schema, docs/API.md and the README sections on GraphQL
21 set up the backend and prisma #36 the backend as an npm workspace with TypeScript and Prisma, and the local database setup in the README
22 create the database schema #38 the database schema and the migrations (Prisma + PostgreSQL), the search tables, and the updated docs/DATA_MODEL.md
23 seed the catalog #50 the seed script that fills the catalog and the search tables from data/, and the word rules for the search

49 commits in all. Nothing that is open on dev is included (#49, #52 and #53 are still in review).

Things to know

The app itself is not changed: there is still no GraphQL server, and the frontend is the Vite starter page. This brings the documentation, the data, the database schema and the seed to main.
main still has the Vite starter page as the front page, so the "Status" text in the README is still right.

Testing

npm run lint, npm run build and npm test pass on dev together with #56.

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Reads the Table of Elements in the PDF and writes the JSON files and one image per element and vault to data/, following docs/DATA_MODEL.md. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

751 elements, 87 vaults, 22 element groups and 208 variant groups, with one image per element and vault. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Adds READMEs for scripts/extract-cop/ and data/, and a project structure section to the root README. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

The database keeps the file name and the API gives a full URL.

…t plan Adds LIMIT_REACHED to the schema and removes the review notes from AI_USAGE.

…a word table

…he-code-of-points 16 extract catalog data from the code of points

docs: add GraphQL schema draft for the catalog

21 set up the backend and prisma

…phql-codegen # Conflicts: # package-lock.json

…ion-tokens

…data-resolvers

…and build

chore: generate TypeScript types from the GraphQL schema

…data-resolvers

feat: add access tokens and rotating refresh tokens

# Conflicts: # package-lock.json

# Conflicts: # README.md

feat: add synthetic test data and measure the search

feat: add the resolvers for gymnasts, their lists and routines

# Conflicts: # docs/AI_USAGE.md

…xpired

feat: set up Apollo Client in the frontend

Anettkva and others added 30 commits October 2, 2026 13:43

chore: ignore the Code of Points PDF and extraction output

37b86f3

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

feat: add script to extract catalog data from the Code of Points

7dc6278

Reads the Table of Elements in the PDF and writes the JSON files and one image per element and vault to data/, following docs/DATA_MODEL.md. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

feat: add catalog data extracted from the Code of Points

918aa79

751 elements, 87 vaults, 22 element groups and 208 variant groups, with one image per element and vault. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

docs: document the Code of Points extraction and the data folder

f3941c9

Adds READMEs for scripts/extract-cop/ and data/, and a project structure section to the root README. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

docs: add GraphQL schema draft for the catalog

a3e10b2

refactor: move GraphQL schema to backend/src

84ecb5a

docs: add user data, login and error handling to the GraphQL schema

f791fbe

Merge origin/main into 11-graphql-schema-catalog

eb10d98

docs: document the GraphQL API and AI usage for the schema

57947fa

docs: replace image with imageUrl in the GraphQL schema

f736d05

The database keeps the file name and the API gives a full URL.

docs: explain why GraphQL and not REST in the README

88b17e4

docs: describe how the API scales and add limits to the schema

c4b28aa

docs: decide on user list pagination, propose tooling and add API tes…

9de3ddf

…t plan Adds LIMIT_REACHED to the schema and removes the review notes from AI_USAGE.

docs: use full text search with prefix matching for the catalog search

76e423c

docs: add rules against SQL injection for the raw search query

b1b5a9a

docs: search without raw SQL using Prisma, a catalog entry table and …

bdc4c0f

…a word table

fix: correct split descriptions and names in the extraction script

4ffac1e

docs: explain how the catalog data was extracted

3ed2f4e

fix: regenerate catalog data with corrected descriptions

4c3e287

docs: update README and data model after the extraction

7899290

Merge pull request #34 from IT2810-H26/16-extract-catalog-data-from-t…

930460f

…he-code-of-points 16 extract catalog data from the code of points

Merge remote-tracking branch 'origin/main' into dev

1a82486

Merge pull request #29 from IT2810-H26/11-graphql-schema-catalog

eeab6c4

docs: add GraphQL schema draft for the catalog

chore: lint the backend with Node rules

5bb2b07

build: add backend workspace with Prisma

7dca85c

docs: document AI usage for the database setup

4b684e4

docs: add local database setup to README

02a4c9d

docs: explain the expected migrate status output on a fresh setup

15020b1

Merge pull request #36 from IT2810-H26/21-set-up-the-backend-and-prisma

5987cef

21 set up the backend and prisma

build: add the Prisma PostgreSQL adapter

c8c80eb

Ronja and others added 30 commits October 21, 2026 12:58

Merge remote-tracking branch 'origin/72-calculate-dscore' into 74-gra…

21e1b17

…phql-codegen # Conflicts: # package-lock.json

Merge remote-tracking branch 'origin/dev' into 74-graphql-codegen

825dbe3

Merge remote-tracking branch 'origin/74-graphql-codegen' into 70-sess…

5c20e3a

…ion-tokens

Merge remote-tracking branch 'origin/70-session-tokens' into 73-user-…

7be6e59

…data-resolvers

chore: generate the Prisma client and GraphQL types before typecheck …

630d1ad

…and build

Merge pull request #78 from IT2810-H26/74-graphql-codegen

8498eca

chore: generate TypeScript types from the GraphQL schema

Merge remote-tracking branch 'origin/dev' into 70-session-tokens

f732c3f

Merge remote-tracking branch 'origin/70-session-tokens' into 73-user-…

44da4b3

…data-resolvers

fix: sign the token with the real time in the Authorization header test

4bb6d2c

style: format server.test.ts with Prettier

9fc29c7

feat: warn at start when SESSION_SECRET is not set

f2cea00

docs: say where expired refresh tokens are deleted

2c9108f

docs: explain that an access token lives on after logout

332f8ca

docs: record why the test files run one at a time

d552fde

docs: remove two claims that were not verified

473b7d4

feat: stop the server in production when SESSION_SECRET is missing

d74a497

docs: set NODE_ENV=production and a real SESSION_SECRET on the VM

54eda8b

Merge pull request #82 from IT2810-H26/70-session-tokens

939adbf

feat: add access tokens and rotating refresh tokens

Merge remote-tracking branch 'origin/dev' into 75-apollo-client

1c408ab

# Conflicts: # package-lock.json

Merge remote-tracking branch 'origin/dev' into 25-synthetic-test-data

f245ced

# Conflicts: # README.md

Merge remote-tracking branch 'origin/dev' into 73-user-data-resolvers

7a62c8a

Merge pull request #69 from IT2810-H26/25-synthetic-test-data

e509df8

feat: add synthetic test data and measure the search

Merge pull request #79 from IT2810-H26/73-user-data-resolvers

86c88db

feat: add the resolvers for gymnasts, their lists and routines

Merge remote-tracking branch 'origin/dev' into 75-apollo-client

f375d81

# Conflicts: # docs/AI_USAGE.md

fix: refresh the session before a request when the access token has e…

7f4bc52

…xpired

fix: time out the login, refresh and logout requests after 5 seconds

ed84434

docs: explain the refresh before requests and the request timeout

869a714

docs: describe the Apache proxy for the API on the VM

5ee72e6

docs: document the VM API address and the bundle size decision

21ad013

Merge pull request #80 from IT2810-H26/75-apollo-client

783b054

feat: set up Apollo Client in the frontend

Uh oh!

chore: merge dev into main #57

chore: merge dev into main #57

ronjalh commented Oct 16, 2026

Uh oh!

Uh oh!

chore: merge dev into main #57

Are you sure you want to change the base?

chore: merge dev into main #57

Conversation

ronjalh commented Oct 16, 2026

Summary

What is new on main

Things to know

Testing

Uh oh!

Uh oh!

What is new on `main`